From: Jo-Philipp Wich <jo@mein.io>
Date: Mon, 6 May 2019 06:22:39 +0000 (+0200)
Subject: luci-base: remove interface from zone upon deletion
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22/%22https:/collectd.org/%22?a=commitdiff_plain;h=0ac85a440a0295acf5c3fd9abe84d46514647909;p=project%2Fluci.git

luci-base: remove interface from zone upon deletion

Fixes: #2690
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/modules/luci-base/luasrc/model/network.lua b/modules/luci-base/luasrc/model/network.lua
index 67a2de4ed2..a36a23f321 100644
--- a/modules/luci-base/luasrc/model/network.lua
+++ b/modules/luci-base/luasrc/model/network.lua
@@ -622,6 +622,12 @@ function del_network(self, n)
 					_uci:delete("wireless", s['.name'], "network")
 				end
 			end)
+
+		local ok, fw = pcall(require, "luci.model.firewall")
+		if ok then
+			fw.init()
+			fw:del_network(n)
+		end
 	end
 	return r
 end